From 477bd9684f0e561561a6470b36af248d94b597c0 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sat, 3 Jan 2015 02:38:24 +0000 Subject: [PATCH] Minor changes for Windows build. Try to get setup.iss newlines handled sensibly. --- gpsbabel/GPSBabel.pro | 7 +- gpsbabel/gui/setup.iss | 170 ++++++++++++++++++++--------------------- 2 files changed, 90 insertions(+), 87 deletions(-) diff --git a/gpsbabel/GPSBabel.pro b/gpsbabel/GPSBabel.pro index 188e791f3..b2ef817eb 100644 --- a/gpsbabel/GPSBabel.pro +++ b/gpsbabel/GPSBabel.pro @@ -28,7 +28,8 @@ ALL_FMTS=$$MINIMAL_FMTS gtm.cc gpsutil.cc pcx.cc \ pocketfms_bc.cc pocketfms_fp.cc pocketfms_wp.cc naviguide.cc enigma.cc \ vpl.cc teletype.cc jogmap.cc bushnell.cc bushnell_trl.cc wintec_tes.cc \ subrip.cc garmin_xt.cc garmin_fit.cc lowranceusr4.cc \ - mtk_locus.cc googledir.cc mapbar_track.cc mapfactor.cc + mtk_locus.cc googledir.cc mapbar_track.cc mapfactor.cc f90g_track.cc \ + energympro.cc mynav.cc DEPRECIATED_FMTS=cetus.cc copilot.cc gpspilot.cc magnav.cc psp.cc gcdb.cc quovadis.cc gpilots.cc geoniche.cc palmdoc.cc hsa_ndv.cc coastexp.cc pathaway.cc coto.cc msroute.cc mag_pdb.cc axim_gpb.cc @@ -61,7 +62,9 @@ SUPPORT = queue.cc route.cc waypt.cc filter_vecs.cc util.cc vecs.cc mkshort.cc \ csv_util.cc strptime.c grtcirc.cc util_crc.cc xmlgeneric.cc \ formspec.cc xmltag.cc cet.cc cet_util.cc fatal.cc rgbcolors.cc \ inifile.cc garmin_fs.cc gbsleep.cc units.cc gbser.cc \ - gbfile.cc parse.cc session.cc main.cc globals.cc src/core/xmlstreamwriter.cc + gbfile.cc parse.cc session.cc main.cc globals.cc \ + src/core/usasciicodec.cc \ + src/core/xmlstreamwriter.cc HEADERS = \ an1sym.h \ diff --git a/gpsbabel/gui/setup.iss b/gpsbabel/gui/setup.iss index d37f17dc7..39cf77a02 100755 --- a/gpsbabel/gui/setup.iss +++ b/gpsbabel/gui/setup.iss @@ -1,85 +1,85 @@ -; -; NOTE: setup.iss is generated from setup.iss.in via autoconf. -; The generated setup.iss is checked in to help keep the version numbers -; synchronized. -; -; Script for generating installation setup program for GPSBabel -; Uses the Inno setup compiler. Typically used from the command -; line "makesetup.bat" which copies QT system files which -; the Innosetup compiler cannot handle. -; -; So it is not a good idea to run this file from the Inno Setup GUI. - -[Setup] -; NOTE: The value of AppId uniquely identifies this application. -; Do not use the same AppId value in installers for other applications. -; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) -AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} -AppName=GPSBabel -AppVerName=GPSBabel 1.5.1 -AppPublisher=GPSBabel -AppPublisherURL=http://www.gpsbabel.org -AppSupportURL=http://www.gpsbabel.org -AppUpdatesURL=http://www.gpsbabel.org -DefaultDirName={pf}\GPSBabel -DefaultGroupName=GPSBabel -OutputDir=release -OutputBaseFilename=GPSBabel-1.5.1-Setup -SetupIconFile=images\babel2.ico -Compression=lzma -SolidCompression=yes -LicenseFile=COPYING.txt - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" - -[Tasks] -Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - -[Files] -; This isn't as wreckless as it seems; these directories are populated on a -; controlled way by the batch file. -Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion -Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs - -Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion -Source: qt.conf; DestDir: "{app}"; Flags: ignoreversion - -Source: \gpsbabel\gui\release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion -;Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion -Source: \gpsbabel\gpsbabel\release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion -; Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs - -; Translation strings extracted from source code. Include it in the dist -; so that users can translate if they want to. -; Source: gpsbabel_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion -; Source: gpsbabelfe_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion - -; Compiled translation strings that are used at runtime. -; Source: gpsbabel_*.qm; DestDir: "{app}\translations"; Flags: ignoreversion -Source: gpsbabelfe*.qm; DestDir: "{app}\translations"; Flags: ignoreversion - -; Now translations from Qt's own UI stuff. -Source: qtdir\translations\*; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs - -; Miscellaneous -Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion -; Source: AUTHORS; DestDir: {app}; Flags: ignoreversion -; Source: README.contrib; DestDir: {app}; Flags: ignoreversion -; Source: README.gui; DestDir: {app}; Flags: ignoreversion - - -; NOTE: Don't use "Flags: ignoreversion" on any shared system files - -[Icons] -Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe" -Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon - -[Run] -Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent - -[Registry] -Root: HKCU; Subkey: "Software\GPSBabel"; Flags: uninsdeletekeyifempty -Root: HKCU; Subkey: "Software\GPSBabel\GPSBabel"; Flags: uninsdeletekey -Root: HKCU; Subkey: "Software\GPSBabel\GPSBabelFE"; Flags: uninsdeletekey - +; +; NOTE: setup.iss is generated from setup.iss.in via autoconf. +; The generated setup.iss is checked in to help keep the version numbers +; synchronized. +; +; Script for generating installation setup program for GPSBabel +; Uses the Inno setup compiler. Typically used from the command +; line "makesetup.bat" which copies QT system files which +; the Innosetup compiler cannot handle. +; +; So it is not a good idea to run this file from the Inno Setup GUI. + +[Setup] +; NOTE: The value of AppId uniquely identifies this application. +; Do not use the same AppId value in installers for other applications. +; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) +AppId={{1B8FE958-A304-4902-BF7A-4E2F0F5B7017} +AppName=GPSBabel +AppVerName=GPSBabel 1.5.2 +AppPublisher=GPSBabel +AppPublisherURL=http://www.gpsbabel.org +AppSupportURL=http://www.gpsbabel.org +AppUpdatesURL=http://www.gpsbabel.org +DefaultDirName={pf}\GPSBabel +DefaultGroupName=GPSBabel +OutputDir=release +OutputBaseFilename=GPSBabel-1.5.2-Setup +SetupIconFile=images\babel2.ico +Compression=lzma +SolidCompression=yes +LicenseFile=COPYING.txt + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" + +[Tasks] +Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked + +[Files] +; This isn't as wreckless as it seems; these directories are populated on a +; controlled way by the batch file. +Source: qtdir\bin\*.dll; DestDir: "{app}"; Flags: ignoreversion +Source: qtdir\plugins\*; DestDir: "{app}\plugins"; Flags: ignoreversion recursesubdirs createallsubdirs + +Source: gmapbase.html; DestDir: "{app}"; Flags: ignoreversion +Source: qt.conf; DestDir: "{app}"; Flags: ignoreversion + +Source: \gpsbabel\gui\release\gpsbabelfe.exe; DestDir: "{app}"; Flags: ignoreversion +;Source: release\libexpat.dll; DestDir: "{app}"; Flags: ignoreversion +Source: \gpsbabel\gpsbabel\release\gpsbabel.exe; DestDir: "{app}"; Flags: ignoreversion +; Source: release\help\*; DestDir: "{app}\help"; Flags: ignoreversion recursesubdirs createallsubdirs + +; Translation strings extracted from source code. Include it in the dist +; so that users can translate if they want to. +; Source: gpsbabel_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion +; Source: gpsbabelfe_*.ts; DestDir: "{app}\translations"; Flags: ignoreversion + +; Compiled translation strings that are used at runtime. +; Source: gpsbabel_*.qm; DestDir: "{app}\translations"; Flags: ignoreversion +Source: gpsbabelfe*.qm; DestDir: "{app}\translations"; Flags: ignoreversion + +; Now translations from Qt's own UI stuff. +Source: qtdir\translations\*; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs + +; Miscellaneous +Source: COPYING.txt; DestDir: {app}; Flags: ignoreversion +; Source: AUTHORS; DestDir: {app}; Flags: ignoreversion +; Source: README.contrib; DestDir: {app}; Flags: ignoreversion +; Source: README.gui; DestDir: {app}; Flags: ignoreversion + + +; NOTE: Don't use "Flags: ignoreversion" on any shared system files + +[Icons] +Name: "{group}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe" +Name: "{commondesktop}\GPSBabel"; Filename: "{app}\gpsbabelfe.exe"; Tasks: desktopicon + +[Run] +Filename: "{app}\gpsbabelfe.exe"; Description: "{cm:LaunchProgram,GPSBabelFE}"; Flags: nowait postinstall skipifsilent + +[Registry] +Root: HKCU; Subkey: "Software\GPSBabel"; Flags: uninsdeletekeyifempty +Root: HKCU; Subkey: "Software\GPSBabel\GPSBabel"; Flags: uninsdeletekey +Root: HKCU; Subkey: "Software\GPSBabel\GPSBabelFE"; Flags: uninsdeletekey + -- 2.30.2